Construct the "Select All" menuitem from stock.

2005-08-29  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktextview.c (popup_targets_received):
	* gtk/gtkentry.c (popup_targets_received): Construct
	the "Select All" menuitem from stock.

	* gtk/stock-icons/stock_select_all_{16,24}.png:
	* gtk/stock-icons/Makefile.am:
	* gtk/gtkiconfactory.c:
	* gtk/gtkstock.h:
	* gtk/gtkstock.c: Add a "Select All" stock item.  (#78545,
	Calum Benson)

diff --git a/ChangeLog b/ChangeLog
index 2414243ba856a6509958688d389d7bee6f824ef4..2918d4aa8197a1da3b4bfa33528d373bfa54e7f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2005-08-29  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktextview.c (popup_targets_received): 
+       * gtk/gtkentry.c (popup_targets_received): Construct
+       the "Select All" menuitem from stock.
+
+       * gtk/stock-icons/stock_select_all_{16,24}.png:
+       * gtk/stock-icons/Makefile.am: 
+       * gtk/gtkiconfactory.c:
+       * gtk/gtkstock.h: 
+       * gtk/gtkstock.c: Add a "Select All" stock item.  (#78545,
+       Calum Benson)
+
        * gtk/gtktrayicon.c: Add a pointer to the spec.
 
        * gtk/gtkstatusicon-x11.c: Add docs.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2414243ba856a6509958688d389d7bee6f824ef4..2918d4aa8197a1da3b4bfa33528d373bfa54e7f9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,16 @@
 2005-08-29  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktextview.c (popup_targets_received): 
+       * gtk/gtkentry.c (popup_targets_received): Construct
+       the "Select All" menuitem from stock.
+
+       * gtk/stock-icons/stock_select_all_{16,24}.png:
+       * gtk/stock-icons/Makefile.am: 
+       * gtk/gtkiconfactory.c:
+       * gtk/gtkstock.h: 
+       * gtk/gtkstock.c: Add a "Select All" stock item.  (#78545,
+       Calum Benson)
+
        * gtk/gtktrayicon.c: Add a pointer to the spec.
 
        * gtk/gtkstatusicon-x11.c: Add docs.

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 7f3bd3fbb9295bff6111bfe3d03b90577f14749e..a6761dd46b449b97a70f3eb03b10b801d29e3569 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,5 +1,10 @@
 2005-08-29  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/Makefile.am (HTML_IMAGES): Add stock_select_all_24.png
+       
+       * gtk/gtk-sections.txt: 
+       * gtk/tmpl/gtkstock.sgml: Add GTK_STOCK_SELECT_ALL. 
+
        * gtk/gtk.types: Add gtk_status_icon_get_type
 
        * gtk/gtk-docs.sgml: Add GtkStatusIcon

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index e469ee23fc4b64fff0cadb2c7255817902554149..840646d9793e932e53db887b67ab04d85cf006a2 100644 (file)
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -200,6 +200,7 @@ HTML_IMAGES = \
        $(top_srcdir)/gtk/stock-icons/stock_revert_rtl_24.png           \
        $(top_srcdir)/gtk/stock-icons/stock_save_24.png                 \
        $(top_srcdir)/gtk/stock-icons/stock_save_as_24.png              \
+       $(top_srcdir)/gtk/stock-icons/stock_select_all_24.png           \
        $(top_srcdir)/gtk/stock-icons/stock_colorselector_24.png        \
        $(top_srcdir)/gtk/stock-icons/stock_color_picker_25.png         \
        $(top_srcdir)/gtk/stock-icons/stock_font_24.png                 \

diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index c3cecc2e600b98ea091be8d8bfdf9826acb8e5f0..b83fb13a8150014a5537026a493510daf1ea4150 100644 (file)
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -5533,6 +5533,7 @@ GTK_STOCK_REMOVE
 GTK_STOCK_REVERT_TO_SAVED
 GTK_STOCK_SAVE
 GTK_STOCK_SAVE_AS
+GTK_STOCK_SELECT_ALL
 GTK_STOCK_SELECT_COLOR
 GTK_STOCK_SELECT_FONT
 GTK_STOCK_SORT_ASCENDING

diff --git a/docs/reference/gtk/tmpl/gtkstock.sgml b/docs/reference/gtk/tmpl/gtkstock.sgml
index 1edf2580a195320bdf2ad0e7b57b6295d45e61be..369dd8e33b5dd0dc391052b8c434b49cccc83a7f 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkstock.sgml
+++ b/docs/reference/gtk/tmpl/gtkstock.sgml
@@ -773,6 +773,13 @@ The "Save As" item.
 </para>
 
 
+<!-- ##### MACRO GTK_STOCK_SELECT_ALL ##### -->
+<para>
+The "Select All" item.
+<inlinegraphic fileref="stock_select_all_24.png" format="PNG"></inlinegraphic>
+</para>
+
+@Since: 2.10
 
 <!-- ##### MACRO GTK_STOCK_SELECT_COLOR ##### -->
 <para>

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 986dabbcb3d9b02b04424bacc82ae375e3d6bdf8..7196bd69eece6ddd772322b9742e0c01dd900391 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -4557,7 +4557,7 @@ popup_targets_received (GtkClipboard     *clipboard,
       gtk_widget_show (menuitem);
       gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
       
-      menuitem = gtk_menu_item_new_with_mnemonic (_("Select _All"));
+      menuitem = gtk_menu_item_new_from_stock (GTK_STOCK_SELECT_ALL, NULL);
       g_signal_connect_swapped (menuitem, "activate",
                                G_CALLBACK (gtk_entry_select_all), entry);
       gtk_widget_show (menuitem);

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 9c47edef847363b9605a4d8aea84971073abd24c..e028d938683a5503c9a31831f8f6f8fcf224e96b 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -792,6 +792,10 @@ get_default_icons (GtkIconFactory *factory)
             16, stock_zoom_fit_16,
             24, stock_zoom_fit_24);
 
+  add_icon2 (factory, GTK_STOCK_SELECT_ALL, 
+            16, stock_select_all_16,
+            24, stock_select_all_24);
+
   /* Generic size only */
 
   add_icon (factory, GTK_STOCK_CLEAR, 24, stock_clear_24);

diff --git a/gtk/gtkstock.c b/gtk/gtkstock.c
index a789eb409dc6027e9b2521dfe7658326309ee07c..7f50d08bb5f5dbe8405116133c58d4cbdddd193c 100644 (file)
--- a/gtk/gtkstock.c
+++ b/gtk/gtkstock.c
@@ -323,7 +323,7 @@ static const GtkStockItem builtin_items [] =
   { GTK_STOCK_CLOSE, N_("_Close"), GDK_CONTROL_MASK, 'w', GETTEXT_PACKAGE },
   { GTK_STOCK_CONNECT, N_("C_onnect"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_CONVERT, N_("_Convert"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_COPY, N_("_Copy"), GDK_CONTROL_MASK, 'c', GETTEXT_PACKAGE },
+   { GTK_STOCK_COPY, N_("_Copy"), GDK_CONTROL_MASK, 'c', GETTEXT_PACKAGE },
   { GTK_STOCK_CUT, N_("Cu_t"), GDK_CONTROL_MASK, 'x', GETTEXT_PACKAGE },
   { GTK_STOCK_DELETE, N_("_Delete"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_DISCONNECT, N_("_Disconnect"), 0, 0, GETTEXT_PACKAGE },
@@ -401,6 +401,7 @@ static const GtkStockItem builtin_items [] =
   { GTK_STOCK_REVERT_TO_SAVED, N_("_Revert"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_SAVE, N_("_Save"), GDK_CONTROL_MASK, 's', GETTEXT_PACKAGE },
   { GTK_STOCK_SAVE_AS, N_("Save _As"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_SELECT_ALL, N_("Select _All"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_SELECT_COLOR, N_("_Color"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_SELECT_FONT, N_("_Font"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_SORT_ASCENDING, N_("_Ascending"), 0, 0, GETTEXT_PACKAGE },

diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h
index d26bb4430bd85fd9e5531244eb1edce04c212d97..7babd59e978fb25f408662753ca364e350bd19aa 100644 (file)
--- a/gtk/gtkstock.h
+++ b/gtk/gtkstock.h
@@ -146,6 +146,7 @@ void          gtk_stock_set_translate_func (const gchar      *domain,
 #define GTK_STOCK_REVERT_TO_SAVED  "gtk-revert-to-saved"
 #define GTK_STOCK_SAVE             "gtk-save"
 #define GTK_STOCK_SAVE_AS          "gtk-save-as"
+#define GTK_STOCK_SELECT_ALL       "gtk-select-all"
 #define GTK_STOCK_SELECT_COLOR     "gtk-select-color"
 #define GTK_STOCK_SELECT_FONT      "gtk-select-font"
 #define GTK_STOCK_SORT_ASCENDING   "gtk-sort-ascending"

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index fb2a26f9db8f1fd1b8a62bada9862e5efe537b53..a57d3840b135d2a539bad8d3877087a8d314b454 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -7122,7 +7122,7 @@ popup_targets_received (GtkClipboard     *clipboard,
       gtk_widget_show (menuitem);
       gtk_menu_shell_append (GTK_MENU_SHELL (text_view->popup_menu), menuitem);
 
-      menuitem = gtk_menu_item_new_with_mnemonic (_("Select _All"));
+      menuitem = gtk_menu_item_new_from_stock (GTK_STOCK_SELECT_ALL, NULL);
       g_signal_connect (menuitem, "activate",
                        G_CALLBACK (select_all_cb), text_view);
       gtk_widget_show (menuitem);

diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am
index 121d3c8ca6303df01845e6e10738024b13e69ca8..f29b94898204a26f7ca93615066d1ac7158705e2 100644 (file)
--- a/gtk/stock-icons/Makefile.am
+++ b/gtk/stock-icons/Makefile.am
@@ -137,6 +137,8 @@ IMAGES = \
        stock_search_24.png             \
        stock_search_replace_16.png     \
        stock_search_replace_24.png     \
+       stock_select_all_16.png         \
+       stock_select_all_24.png         \
        stock_sort_ascending_16.png     \
        stock_sort_ascending_24.png     \
        stock_sort_descending_16.png    \
@@ -324,6 +326,8 @@ VARIABLES5 = \
        stock_search_24         $(srcdir)/stock_search_24.png           \
        stock_search_replace_16 $(srcdir)/stock_search_replace_16.png   \
        stock_search_replace_24 $(srcdir)/stock_search_replace_24.png   \
+       stock_select_all_16     $(srcdir)/stock_select_all_16.png       \
+       stock_select_all_24     $(srcdir)/stock_select_all_24.png       \
        stock_sort_ascending_16 $(srcdir)/stock_sort_ascending_16.png   \
        stock_sort_ascending_24 $(srcdir)/stock_sort_ascending_24.png   \
        stock_sort_descending_16  $(srcdir)/stock_sort_descending_16.png  \

diff --git a/gtk/stock-icons/stock_select_all_16.png b/gtk/stock-icons/stock_select_all_16.png
new file mode 100644 (file)
index 0000000..4938a9d
Binary files /dev/null and b/gtk/stock-icons/stock_select_all_16.png differ

diff --git a/gtk/stock-icons/stock_select_all_24.png b/gtk/stock-icons/stock_select_all_24.png
new file mode 100644 (file)
index 0000000..5d25b70
Binary files /dev/null and b/gtk/stock-icons/stock_select_all_24.png differ